Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nykopol overriden options #3506

Merged
merged 6 commits into from
Feb 3, 2014
Merged

Nykopol overriden options #3506

merged 6 commits into from
Feb 3, 2014

Conversation

weaverryan
Copy link
Member

See #3417 - this is just a rebase to continue it :)

Q A
Doc fix? no
New docs? yes
Applies to 2.3
Fixed tickets #3412

Thanks!

choice is selected.
In checkbox, the value of ``empty_data`` is overriden by the value returned by
the data transformer (see :doc:`/cookbook/form/data_transformers.rst`).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is unnecessary, isn't it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're totally right - removed :)

weaverryan added a commit that referenced this pull request Feb 3, 2014
This PR was merged into the 2.3 branch.

Discussion
----------

Nykopol overriden options

See #3417 - this is just a rebase to continue it :)

| Q             | A
| ------------- | ---
| Doc fix?      | no
| New docs?     | yes
| Applies to    | 2.3
| Fixed tickets | #3412

Thanks!

Commits
-------

e574e97 Removing an extra line thanks to @xabbuh
4f6cb9d Some additional tweaks and probably some merge conflict fixes
362c8b4 document overriden options of choice field
70feefd document overriden options of checkbox
c62cd13 correct overriden option of button and add checkbox overriden option
ab4aafe correct overriden option of button and add checkbox overriden option
@weaverryan weaverryan merged commit e574e97 into 2.3 Feb 3, 2014
@wouterj wouterj deleted the nykopol-overriden_options branch February 3, 2014 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants